From ecf5c113a8450a96e193a2510594d8023d8be766 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 22 Mar 2023 15:27:17 +0100
Subject: [PATCH] Use AccountPtr in serverVersionChanged signal instead of raw
 pointer

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/application.cpp | 2 +-
 src/gui/folderman.cpp   | 2 +-
 src/gui/folderman.h     | 2 +-
 src/gui/owncloudgui.cpp | 6 +++---
 src/gui/owncloudgui.h   | 4 ++--
 src/libsync/account.cpp | 2 +-
 src/libsync/account.h   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 53c85e4b2..ecaca4fb3 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -655,7 +655,7 @@ void Application::slotAccountStateAdded(AccountState *accountState)
     connect(accountState->account().data(), &Account::serverVersionChanged,
         _folderManager.data(), &FolderMan::slotServerVersionChanged);
 
-    _gui->slotTrayMessageIfServerUnsupported(accountState->account().data());
+    _gui->slotTrayMessageIfServerUnsupported(accountState->account());
 }
 
 void Application::slotCleanup()
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 5ee0737e2..4abfe8458 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1107,7 +1107,7 @@ void FolderMan::slotForwardFolderSyncStateChange()
     }
 }
 
-void FolderMan::slotServerVersionChanged(Account *account)
+void FolderMan::slotServerVersionChanged(const OCC::AccountPtr &account)
 {
     // Pause folders if the server version is unsupported
     if (account->serverVersionUnsupported()) {
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 4c33005bb..a1fdf81b7 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -317,7 +317,7 @@ private slots:
     // FolderMan::folderSyncStateChange(Folder*) signal.
     void slotForwardFolderSyncStateChange();
 
-    void slotServerVersionChanged(OCC::Account *account);
+    void slotServerVersionChanged(const OCC::AccountPtr &account);
 
     /**
      * A file whose locks were being monitored has become unlocked.
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 5f5478260..e38727596 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -264,7 +264,7 @@ void ownCloudGui::slotOpenPath(const QString &path)
     showInFileManager(path);
 }
 
-void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
+void ownCloudGui::slotTrayMessageIfServerUnsupported(const AccountPtr &account)
 {
     if (account->serverVersionUnsupported()) {
         slotShowTrayMessage(
@@ -276,8 +276,8 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
     }
 }
 
-void ownCloudGui::slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
-                                                 AccountState::State state)
+void ownCloudGui::slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
+                                                 const OCC::AccountState::State state)
 {
     if (state == AccountState::NeedToSignTermsOfService) {
         slotShowTrayMessage(
diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h
index 446b58a9c..d02d7d124 100644
--- a/src/gui/owncloudgui.h
+++ b/src/gui/owncloudgui.h
@@ -91,8 +91,8 @@ public slots:
     void slotSettingsDialogActivated();
     void slotHelp();
     void slotOpenPath(const QString &path);
-    void slotTrayMessageIfServerUnsupported(OCC::Account *account);
-    void slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
+    void slotTrayMessageIfServerUnsupported(const OCC::AccountPtr &account);
+    void slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
                                         OCC::AccountState::State state);
 
     /**
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index e01fdbe0e..bb0a0e117 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -809,7 +809,7 @@ void Account::setServerVersion(const QString &version)
 
     auto oldServerVersion = _serverVersion;
     _serverVersion = version;
-    emit serverVersionChanged(this, oldServerVersion, version);
+    emit serverVersionChanged(sharedFromThis(), oldServerVersion, version);
 }
 
 void Account::writeAppPasswordOnce(QString appPassword){
diff --git a/src/libsync/account.h b/src/libsync/account.h
index 19c0a1124..041144387 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -448,7 +448,7 @@ signals:
 
     void wantsFoldersSynced();
 
-    void serverVersionChanged(OCC::Account *account, const QString &newVersion, const QString &oldVersion);
+    void serverVersionChanged(const AccountPtr &account, const QString &newVersion, const QString &oldVersion);
 
     void accountChangedAvatar();
     void accountChangedDisplayName();
-- 
2.30.2